Additions.

2003-08-31  Matthias Clasen  <maclas@gmx.de>

	* gtk/tmpl/gtkuimanager.sgml:
	* gtk/tmpl/gtkactiongroup.sgml:
	* gtk/tmpl/gtkaction.sgml:
	* gtk/tmpl/gtktoggleaction.sgml:
	* gtk/tmpl/gtkradioaction.sgml: Additions.

	* gtk/gtk-sections.txt: Updates.

	* gtk/gtk.types: Add GtkAction, GtkActionGroup, GtkToggleAction,
	GtkRadioAction and GtkUIManager.

	* gtk/gtkaction.c:
	* gtk/gtkactiongroup.c: Some doc tweaks.

	* gtk/gtkuimanager.[hc]: Get rid of the remove_widget signal. It
	wasn't emitted anyway. Some doc tweaks.

diff --git a/ChangeLog b/ChangeLog
index 5f326f0dd1572b0c41b3feab7c67442c657edf97..e62ecf6c9c8df055a86b3e5c434533e56baf36dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkactiongroup.c: Add some docs.
+       * gtk/gtkaction.c: 
+       * gtk/gtkactiongroup.c: Some doc tweaks.
 
        * gtk/gtkuimanager.[hc]: Get rid of the remove_widget signal. It
-       wasn't emitted anyway.
+       wasn't emitted anyway. Some doc tweaks.
 
 2003-08-30  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5f326f0dd1572b0c41b3feab7c67442c657edf97..e62ecf6c9c8df055a86b3e5c434533e56baf36dc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,9 +1,10 @@
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkactiongroup.c: Add some docs.
+       * gtk/gtkaction.c: 
+       * gtk/gtkactiongroup.c: Some doc tweaks.
 
        * gtk/gtkuimanager.[hc]: Get rid of the remove_widget signal. It
-       wasn't emitted anyway.
+       wasn't emitted anyway. Some doc tweaks.
 
 2003-08-30  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5f326f0dd1572b0c41b3feab7c67442c657edf97..e62ecf6c9c8df055a86b3e5c434533e56baf36dc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,9 +1,10 @@
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkactiongroup.c: Add some docs.
+       * gtk/gtkaction.c: 
+       * gtk/gtkactiongroup.c: Some doc tweaks.
 
        * gtk/gtkuimanager.[hc]: Get rid of the remove_widget signal. It
-       wasn't emitted anyway.
+       wasn't emitted anyway. Some doc tweaks.
 
 2003-08-30  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5f326f0dd1572b0c41b3feab7c67442c657edf97..e62ecf6c9c8df055a86b3e5c434533e56baf36dc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,9 +1,10 @@
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkactiongroup.c: Add some docs.
+       * gtk/gtkaction.c: 
+       * gtk/gtkactiongroup.c: Some doc tweaks.
 
        * gtk/gtkuimanager.[hc]: Get rid of the remove_widget signal. It
-       wasn't emitted anyway.
+       wasn't emitted anyway. Some doc tweaks.
 
 2003-08-30  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5f326f0dd1572b0c41b3feab7c67442c657edf97..e62ecf6c9c8df055a86b3e5c434533e56baf36dc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,9 +1,10 @@
 2003-08-31  Matthias Clasen  <maclas@gmx.de>
 
-       * gtk/gtkactiongroup.c: Add some docs.
+       * gtk/gtkaction.c: 
+       * gtk/gtkactiongroup.c: Some doc tweaks.
 
        * gtk/gtkuimanager.[hc]: Get rid of the remove_widget signal. It
-       wasn't emitted anyway.
+       wasn't emitted anyway. Some doc tweaks.
 
 2003-08-30  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 283fab7eb9563665ded1815cabf4b0e7a21c0600..c0233b5df03d57a4bd8ade3c1698c726040b22b0 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-31  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/tmpl/gtkuimanager.sgml: 
+       * gtk/tmpl/gtkactiongroup.sgml: 
+       * gtk/tmpl/gtkaction.sgml: 
+       * gtk/tmpl/gtktoggleaction.sgml: 
+       * gtk/tmpl/gtkradioaction.sgml: Additions.
+
+       * gtk/gtk-sections.txt: Updates.
+
+       * gtk/gtk.types: Add GtkAction, GtkActionGroup, GtkToggleAction,
+       GtkRadioAction and GtkUIManager.
+       
 2003-08-28  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/tmpl/events.sgml: Improve PointerHint docs.

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index a57fae8bd96a456e37a7809891b5a1b1eb438e47..5bfac533f9214d390db69d637cbef079102bc719 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -130,8 +130,8 @@ GtkActionPrivate
 <FILE>gtkactiongroup</FILE>
 <TITLE>GtkActionGroup</TITLE>
 GtkActionGroup
-GtkActionGroupEntryTrype
-GtkActionGroupEntry
+GtkActionEntry
+GtkRadioActionEntry
 gtk_action_group_new
 gtk_action_group_get_name
 gtk_action_group_get_action
@@ -139,6 +139,11 @@ gtk_action_group_list_actions
 gtk_action_group_add_action
 gtk_action_group_remove_action
 gtk_action_group_add_actions
+gtk_action_group_add_actions_full 
+gtk_action_group_add_radio_actions
+gtk_action_group_add_radio_actions_full
+gtk_action_group_set_translate_func
+gtk_action_group_set_translation_domain
 <SUBSECTION Standard>
 GTK_TYPE_ACTION_GROUP
 GTK_ACTION_GROUP
@@ -1718,6 +1723,8 @@ gtk_menu_item_get_type
 <TITLE>GtkUIManager</TITLE>
 GtkUIManager
 gtk_ui_manager_new
+gtk_ui_manager_set_add_tearoffs
+gtk_ui_manager_get_add_tearoffs
 gtk_ui_manager_insert_action_group
 gtk_ui_manager_remove_action_group
 gtk_ui_manager_get_action_groups
@@ -1727,6 +1734,7 @@ gtk_ui_manager_add_ui_from_string
 gtk_ui_manager_add_ui_from_file
 gtk_ui_manager_remove_ui
 gtk_ui_manager_get_ui
+gtk_ui_manager_activate
 <SUBSECTION Standard>
 GTK_TYPE_UI_MANAGER
 GTK_UI_MANAGER
@@ -2094,6 +2102,7 @@ gtk_progress_bar_get_type
 GtkRadioAction
 gtk_radio_action_get_group
 gtk_radio_action_set_group
+gtk_radio_action_get_current_value
 <SUBSECTION Standard>
 GTK_TYPE_RADIO_ACTION
 GTK_RADIO_ACTION
@@ -2103,7 +2112,7 @@ GTK_IS_RADIO_ACTION_CLASS
 GTK_RADIO_ACTION_GET_CLASS
 <SUBSECTION Private>
 gtk_radio_action_get_type
-GtkRadionActionPrivate
+GtkRadioActionPrivate
 </SECTION>
 
 <SECTION>

diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types
index 61007888cbbc9c5549c645b4d29c9a7ada96a1fb..d3ebc3b9ba3ea65b8e612143e9c41f5cf9a4ff8c 100644 (file)
--- a/docs/reference/gtk/gtk.types
+++ b/docs/reference/gtk/gtk.types
@@ -3,6 +3,8 @@
 gtk_accel_group_get_type
 gtk_accel_label_get_type
 gtk_accessible_get_type
+gtk_action_get_type
+gtk_action_group_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
 gtk_arrow_get_type
@@ -78,6 +80,7 @@ gtk_plug_get_type
 gtk_preview_get_type
 gtk_progress_bar_get_type
 gtk_progress_get_type
+gtk_radio_action_get_type
 gtk_radio_button_get_type
 gtk_radio_menu_item_get_type
 gtk_radio_tool_button_get_type
@@ -106,6 +109,7 @@ gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
 gtk_tips_query_get_type
+gtk_toggle_action_get_type
 gtk_toggle_button_get_type
 gtk_toggle_tool_button_get_type
 gtk_toolbar_get_type
@@ -119,6 +123,7 @@ gtk_tree_selection_get_type
 gtk_tree_store_get_type
 gtk_tree_view_column_get_type
 gtk_tree_view_get_type
+gtk_ui_manager_get_type
 gtk_vbox_get_type
 gtk_vbutton_box_get_type
 gtk_viewport_get_type

diff --git a/docs/reference/gtk/tmpl/gtkaction.sgml b/docs/reference/gtk/tmpl/gtkaction.sgml
index d9ebb6bdaa2144058d8d556801aad9f19822e891..f900a26fd221d3e70b54721fa40bb3c0e8b72c9e 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkaction.sgml
+++ b/docs/reference/gtk/tmpl/gtkaction.sgml
@@ -2,26 +2,58 @@
 GtkAction
 
 <!-- ##### SECTION Short_Description ##### -->
-
+an action which can be triggered by a menu or toolbar item
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+Actions represent operations that the user can be perform, along with
+some information how it should be presented in the interface. Each action 
+provides methods to create icons, menu items and toolbar items representing 
+itself.
+</para>
+<para>
+As well as the callback that is called when the action gets activated, the 
+following also gets associated with the action:
+<itemizedlist>
+  <listitem><para>a name (not translated, for path lookup)</para></listitem>
+  <listitem><para>a label (translated, for display)</para></listitem>
+  <listitem><para>an accelerator</para></listitem>
+  <listitem><para>whether label indicates a stock id</para></listitem>
+  <listitem><para>a tooltip (optional, translated)</para></listitem>
+  <listitem><para>a toolbar label (optional, shorter than label)</para></listitem>
+</itemizedlist>
+The action will also have some state information:
+<itemizedlist>
+  <listitem><para>visible (shown/hidden)</para></listitem>
+  <listitem><para>sensitive (enabled/disabled)</para></listitem>
+</itemizedlist>
+</para>
+<para>
+Apart from regular actions, there are <link linkend="GtkToggleAction">toggle 
+actions</link>, which can be toggled between two states and <link 
+linkend="GtkRadioAction">radio actions</link>, of which only one in a group 
+can be in the "active" state. Other actions can be implemented as #GtkAction 
+subclasses.
+</para>
+<para>
+Each action can have one or more proxy menu item, toolbar button or
+other proxy widgets.  Proxies mirror the state of the action (text
+label, tooltip, icon, visible, sensitive, etc), and should change when
+the action's state changes. When the proxy is activated, it should
+activate its action.
 </para>
-
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
-
+#GtkActionGroup, #GtkMenuMerge
 </para>
 
-
 <!-- ##### STRUCT GtkAction ##### -->
 <para>
-
+The <structname>GtkAction</structname> struct contains only private members
+and should not be accessed directly.
 </para>
 
-@object: 
 
 <!-- ##### FUNCTION gtk_action_get_name ##### -->
 <para>
@@ -122,3 +154,45 @@ GtkAction
 @accel_path: 
 
 
+<!-- ##### SIGNAL GtkAction::activate ##### -->
+<para>
+
+</para>
+
+@action: the object which received the signal.
+
+<!-- ##### ARG GtkAction:label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:sensitive ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:short-label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:stock-id ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:tooltip ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAction:visible ##### -->
+<para>
+
+</para>
+

diff --git a/docs/reference/gtk/tmpl/gtkactiongroup.sgml b/docs/reference/gtk/tmpl/gtkactiongroup.sgml
index 93ce225eb253390368e9b97701558beb46bfd003..04addcf0d1accbe69a934dfeef3a0e9ef4e15b98 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkactiongroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkactiongroup.sgml
@@ -2,41 +2,68 @@
 GtkActionGroup
 
 <!-- ##### SECTION Short_Description ##### -->
-
+a group of actions
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+Actions are organised into groups.  An action group is essentially a
+map from names to #GtkAction objects.
+</para>
+<para>
+All actions that would make sense to use in a particular context
+should be in a single group.  Multiple action groups may be used for a
+particular user interface.  In fact, it is expected that most nontrivial 
+applications will make use of multiple groups.  For example, in an application
+that can edit multiple documents, one group holding global actions 
+(eg. quit, about, new), and one group per document holding actions that 
+act on that document (eg. save, cut/copy/paste, etc).  Each window's menus 
+would be constructed from a combination of two action groups.
 </para>
-
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### STRUCT GtkActionGroup ##### -->
 <para>
-
+The <structname>GtkActionGroup</structname> struct contains only private members
+and should not be accessed directly.
 </para>
 
-@parent: 
 
-<!-- ##### STRUCT GtkActionGroupEntry ##### -->
+<!-- ##### STRUCT GtkActionEntry ##### -->
 <para>
+<structname>GtkActionEntry</structname> structs are used with 
+gtk_action_group_add_actions() to construct actions.
+</para>
 
+@name: The name of the action.
+@stock_id: The stock id for the action.
+@label: The label for the action. This field should typically be marked for 
+    translation, see gtk_action_group_set_translation_domain().
+@accelerator: The accelerator for the action, in the format understood by 
+    gtk_accelerator_parse().
+@tooltip: The tooltip for the action. This field should typically be marked for 
+    translation, see gtk_action_group_set_translation_domain().
+@callback: The function to call when the action is activated.
+@is_toggle: If this is %TRUE, a #GtkToggleAction is constructed, else a #GtkAction.
+
+<!-- ##### STRUCT GtkRadioActionEntry ##### -->
+<para>
+<structname>GtkRadioActionEntry</structname> structs are used with 
+gtk_action_group_add_radio_actions() to construct radio actions.
 </para>
 
-@name: 
-@label: 
-@stock_id: 
-@accelerator: 
-@tooltip: 
-@callback: 
-@user_data: 
-@entry_type: 
-@extra_data: 
+@name: The name of the action.
+@stock_id: The stock id for the action.
+@label: The label for the action. This field should typically be marked for 
+    translation, see gtk_action_group_set_translation_domain().
+@accelerator: The accelerator for the action, in the format understood by 
+    gtk_accelerator_parse().
+@tooltip: The tooltip for the action. This field should typically be marked for 
+    translation, see gtk_action_group_set_translation_domain().
+@value: The value to set on the radio action. See gtk_radio_action_get_current_value().
 
 <!-- ##### FUNCTION gtk_action_group_new ##### -->
 <para>
@@ -101,5 +128,63 @@ GtkActionGroup
 @action_group: 
 @entries: 
 @n_entries: 
+@user_data: 
+
+
+<!-- ##### FUNCTION gtk_action_group_add_actions_full ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@entries: 
+@n_entries: 
+@user_data: 
+@destroy: 
+
+
+<!-- ##### FUNCTION gtk_action_group_add_radio_actions ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@entries: 
+@n_entries: 
+@on_change: 
+@user_data: 
+
+
+<!-- ##### FUNCTION gtk_action_group_add_radio_actions_full ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@entries: 
+@n_entries: 
+@on_change: 
+@user_data: 
+@destroy: 
+
+
+<!-- ##### FUNCTION gtk_action_group_set_translate_func ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@func: 
+@data: 
+@notify: 
+
+
+<!-- ##### FUNCTION gtk_action_group_set_translation_domain ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@domain: 
 
 

diff --git a/docs/reference/gtk/tmpl/gtkradioaction.sgml b/docs/reference/gtk/tmpl/gtkradioaction.sgml
index 081276d404dadc5d95d77c674032f8ac61578d2c..e1541b65d44db3a16f5eac32898d526927c50948 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkradioaction.sgml
+++ b/docs/reference/gtk/tmpl/gtkradioaction.sgml
@@ -2,26 +2,26 @@
 GtkRadioAction
 
 <!-- ##### SECTION Short_Description ##### -->
-
+an action of which only one in a group can be active
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
-</para>
-
+A #GtkRadioAction is similar to #GtkRadioMenuItem. A number of radio
+actions can be linked together so that only one may be active at any 
+one time.
+</para>   
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### STRUCT GtkRadioAction ##### -->
 <para>
-
+The <structname>GtkRadioAction</structname> struct contains 
+only private members and should not be accessed directly.
 </para>
 
-@parent: 
 
 <!-- ##### FUNCTION gtk_radio_action_get_group ##### -->
 <para>
@@ -41,3 +41,25 @@ GtkRadioAction
 @group: 
 
 
+<!-- ##### FUNCTION gtk_radio_action_get_current_value ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
+<!-- ##### SIGNAL GtkRadioAction::changed ##### -->
+<para>
+
+</para>
+
+@radioaction: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG GtkRadioAction:value ##### -->
+<para>
+
+</para>
+

diff --git a/docs/reference/gtk/tmpl/gtktoggleaction.sgml b/docs/reference/gtk/tmpl/gtktoggleaction.sgml
index 8b87e764ad6f82bd00bcdbd46873f121e46aa848..d3ccd4db9eb98b05be2236353cb3fcec30a09dbb 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktoggleaction.sgml
+++ b/docs/reference/gtk/tmpl/gtktoggleaction.sgml
@@ -2,26 +2,25 @@
 GtkToggleAction
 
 <!-- ##### SECTION Short_Description ##### -->
-
+an action which can be toggled between two states
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+A #GtkToggleAction corresponds roughly to a #GtkCheckMenuItem. It has an
+"active" state specifying whether the action has been checked or not.
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### STRUCT GtkToggleAction ##### -->
 <para>
-
+The <structname>GtkToggleAction</structname> struct contains only 
+private members and should not be accessed directly.
 </para>
 
-@parent: 
 
 <!-- ##### FUNCTION gtk_toggle_action_toggled ##### -->
 <para>
@@ -49,3 +48,10 @@ GtkToggleAction
 @Returns: 
 
 
+<!-- ##### SIGNAL GtkToggleAction::toggled ##### -->
+<para>
+
+</para>
+
+@toggleaction: the object which received the signal.
+

diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml
index 2d22b05e36ad84c12dc8db7f6761019d77e02a49..d49356556fdcd80889479b9d28f1be049a9c04f8 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkuimanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml
@@ -10,19 +10,70 @@ A #GtkUIManager constructs a user interface (menus and toolbars) from
 one or more UI definitions, which reference actions from one or ore 
 action groups.
 </para>
-
+<refsect2 id="XML-UI"><title>UI Definitions</title>
+<para>
+The UI definitions are specified in an XML format which is described
+by the following DTD.
+<programlisting>
+&lt;!ELEMENT ui          (menubar|toolbar|popup)* &gt;
+&lt;!ELEMENT menubar     (menuitem|separator|placeholder|menu)* &gt;
+&lt;!ELEMENT menu        (menuitem|separator|placeholder|menu)* &gt;
+&lt;!ELEMENT popup       (menuitem|separator|placeholder|menu)* &gt;
+&lt;!ELEMENT toolbar     (toolitem|separator|placeholder)* &gt;
+&lt;!ELEMENT placeholder (menuitem|toolitem|separator|placeholder|menu)* &gt;
+&lt;!ELEMENT menuitem     EMPTY &gt;
+&lt;!ELEMENT toolitem     EMPTY &gt;
+&lt;!ELEMENT separator    EMPTY &gt;
+&lt;!ATTLIST menubar      name             &num;IMPLIED &gt;
+&lt;!ATTLIST toolbar      name             &num;IMPLIED &gt;
+&lt;!ATTLIST popup        name             &num;IMPLIED &gt;
+&lt;!ATTLIST placeholder  name             &num;IMPLIED &gt;
+&lt;!ATTLIST menu         name             &num;IMPLIED
+                       action           &num;REQUIRED
+                       pos    (top|bot) &num;IMPLIED &gt;
+&lt;!ATTLIST menuitem     name             &num;IMPLIED
+                       action           &num;REQUIRED
+                       pos    (top|bot) &num;IMPLIED &gt;
+&lt;!ATTLIST toolitem     name             &num;IMPLIED
+                       action           &num;REQUIRED
+                       pos    (top|bot) &num;IMPLIED &gt;
+</programlisting>
+There are some additional restrictions beyond those specified in the DTD, e.g.
+every toolitem must have a toolbar in its anchestry and every menuitem must have
+a menubar or popup in its anchestry. If a name is not specified, it defaults to 
+the action. If an action is not specified either, the element name is used.
+</para>
+<para>
+The constructed widget hierarchy is very similar to the element
+tree of the XML, with the exception that placeholders are merged into their 
+parents. The correspondence of XML elements to widgets should be almost obvious:
+<itemizedlist>
+<listitem><para>menubar: a #GtkMenuBar</para></listitem>
+<listitem><para>toolbar: a #GtkToolBar</para></listitem>
+<listitem><para>popup: a toplevel #GtkMenu</para></listitem>
+<listitem><para>menu: a #GtkMenu attached to a menuitem</para></listitem>
+<listitem><para>menuitem: a #GtkMenuItem subclass, the exact type depends on the action</para></listitem>
+<listitem><para>toolitem: a #GtkToolItem subclass, the exact type depends on the action</para></listitem>
+<listitem><para>separator: a #GtkSeparatorMenuItem or #GtkSeparatorToolItem</para></listitem>
+</itemizedlist>
+</para>
+<para>
+The pos attribute determines where a constructed widget is positioned wrt. to its
+siblings in the partially constructed tree. If it is "top", the widget is prepended,
+otherwise it is appended.
+</para>
+</refsect2>
+ 
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### STRUCT GtkUIManager ##### -->
 <para>
 
 </para>
 
-@parent: 
 
 <!-- ##### FUNCTION gtk_ui_manager_new ##### -->
 <para>
@@ -32,6 +83,24 @@ action groups.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_ui_manager_set_add_tearoffs ##### -->
+<para>
+
+</para>
+
+@self: 
+@add_tearoffs: 
+
+
+<!-- ##### FUNCTION gtk_ui_manager_get_add_tearoffs ##### -->
+<para>
+
+</para>
+
+@self: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_ui_manager_insert_action_group ##### -->
 <para>
 
@@ -120,3 +189,32 @@ action groups.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_ui_manager_activate ##### -->
+<para>
+
+</para>
+
+@self: 
+@path: 
+
+
+<!-- ##### SIGNAL GtkUIManager::add-widget ##### -->
+<para>
+
+</para>
+
+@uimanager: the object which received the signal.
+@widget: 
+
+<!-- ##### SIGNAL GtkUIManager::changed ##### -->
+<para>
+
+</para>
+
+@uimanager: the object which received the signal.
+
+<!-- ##### ARG GtkUIManager:add-tearoffs ##### -->
+<para>
+
+</para>
+

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index cd3b5c3cab153108cc18dd59a811bc50db2eda15..f1b9e0c6137421b326cac343521909fe7e699e87 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -212,6 +212,14 @@ gtk_action_class_init (GtkActionClass *klass)
                                                         TRUE,
                                                         G_PARAM_READWRITE));
 
+  /**
+   * GtkAction::activate:
+   * @action: the #GtkAction
+   *
+   * The "activate" signal is emitted when the action is activated.
+   *
+   * Since: 2.4
+   */
   action_signals[ACTIVATE] =
     g_signal_new ("activate",
                  G_OBJECT_CLASS_TYPE (klass),

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index e6a18bd1dbd13c178b6d70362ff91b92326c5ca6..945ceeb071b113cfb7cb55749b2654f2ac627215 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -319,9 +319,9 @@ gtk_ui_manager_get_property (GObject         *object,
 /**
  * gtk_ui_manager_new:
  * 
- * Creates a new menu merge object.
+ * Creates a new ui manager object.
  * 
- * Return value: a new menu merge object.
+ * Return value: a new ui manager object.
  *
  * Since: 2.4
  **/
@@ -1077,8 +1077,9 @@ add_ui_from_string (GtkUIManager *self,
  * @length: the length of @buffer (may be -1 if @buffer is nul-terminated)
  * @error: return location for an error
  * 
- * Parses a string containing a UI description and merge it with the current
- * contents of @self. FIXME: describe the XML format.
+ * Parses a string containing a <link linkend="XML-UI">UI description</link> and 
+ * merges it with the current contents of @self. An enclosing &lt;ui&gt; &lt;/ui&gt;
+ * element is added if it is missing.
  * 
  * Return value: The merge id for the merged UI. The merge id can be used
  *   to unmerge the UI with gtk_ui_manager_remove_ui(). If an error occurred,
@@ -1119,8 +1120,8 @@ gtk_ui_manager_add_ui_from_string (GtkUIManager *self,
  * @filename: the name of the file to parse 
  * @error: return location for an error
  * 
- * Parses a file containing a UI description and merge it with the current
- * contents of @self. See gtk_ui_manager_add_ui_from_file().
+ * Parses a file containing a <link linkend="XML-UI">UI description</link> and 
+ * merges it with the current contents of @self. 
  * 
  * Return value: The merge id for the merged UI. The merge id can be used
  *   to unmerge the UI with gtk_ui_manager_remove_ui(). If an error occurred,